Draft
Conversation
- Remove tls_dh code in favor of OpenSSL's auto mode - Use new hashing API - Add missing return value checks
pschlan
commented
Mar 10, 2025
Comment on lines
+1982
to
+1994
| std::vector<uint8_t> hash(EVP_MD_size(EVP_sha256())); | ||
|
|
||
| if (EVP_DigestInit_ex(sha256, EVP_sha256(), nullptr) && EVP_DigestUpdate(sha256, buffer, length) && EVP_DigestFinal_ex(sha256, hash.data(), nullptr)) | ||
| { | ||
| char hexBuff[3]; | ||
| for(std::size_t i=0; i < hash.size(); i++) | ||
| { | ||
| snprintf(hexBuff, 3, "%02X", hash[i]); | ||
| result.append(hexBuff); | ||
| } | ||
| } | ||
|
|
||
| EVP_MD_CTX_free(sha256); |
pschlan
changed the title
pschlan
commented
Mar 10, 2025
| @@ -1 +1 @@ | |||
| 3306 | |||
| 3310 | |||
Contributor
Author
There was a problem hiding this comment.
Should only be bumped by one, probably
pschlan
commented
Mar 10, 2025
Comment on lines
232
to
241
| if(strcmp(cfg->Get("user_space_add"), "1") == 0) | ||
| { | ||
| db->Query("SELECT bm60_users.id, bm60_users.traffic_up, bm60_users.traffic_down, bm60_gruppen.traffic+bm60_users.traffic_add AS traffic, bm60_gruppen.wd_open_kbs, bm60_gruppen.id FROM bm60_users,bm60_gruppen WHERE bm60_users.email='%q' AND bm60_gruppen.id=bm60_users.gruppe AND bm60_gruppen.share='yes' AND bm60_gruppen.webdisk>0", | ||
| res = db->Query("SELECT bm60_users.id, bm60_users.traffic_up, bm60_users.traffic_down, bm60_gruppen.traffic+bm60_users.traffic_add AS traffic, bm60_gruppen.wd_open_kbs, bm60_gruppen.id FROM bm60_users,bm60_gruppen WHERE bm60_users.email='%q' AND bm60_gruppen.id=bm60_users.gruppe AND bm60_gruppen.share='yes' AND bm60_gruppen.webdisk>0", | ||
| szSearchUser); | ||
| } | ||
| else | ||
| { | ||
| db->Query("SELECT bm60_users.id, bm60_users.traffic_up, bm60_users.traffic_down, bm60_gruppen.traffic, bm60_gruppen.wd_open_kbs, bm60_gruppen.id FROM bm60_users,bm60_gruppen WHERE bm60_users.email='%q' AND bm60_gruppen.id=bm60_users.gruppe AND bm60_gruppen.share='yes' AND bm60_gruppen.webdisk>0", | ||
| res = db->Query("SELECT bm60_users.id, bm60_users.traffic_up, bm60_users.traffic_down, bm60_gruppen.traffic, bm60_gruppen.wd_open_kbs, bm60_gruppen.id FROM bm60_users,bm60_gruppen WHERE bm60_users.email='%q' AND bm60_gruppen.id=bm60_users.gruppe AND bm60_gruppen.share='yes' AND bm60_gruppen.webdisk>0", | ||
| szSearchUser); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
We should probably remove HTTP support entirely, at it is incomplete and - obviously - untested.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picked from main...b1gMail-OSS:b1gMailServer:ubuntu22.04-env + added improvements on top